From db19e295c982bb6308e9d2be42f5feb281474952 Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Mon, 3 Jul 2006 08:33:15 -0600 Subject: [PATCH] [IA64] A few clean ups in __xen_create/destroy_contiguous_region. This is the IA64 counter part of the C/S 10563:a75c1bdfe76146ad591574d805be5be0a3098d2a of xen-unstable.hg Signed-off-by: Isaku Yamahata --- linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c index f0d07e635d..aa55acba74 100644 --- a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c +++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c @@ -198,7 +198,7 @@ __xen_create_contiguous_region(unsigned long vstart, .nr_exchanged = 0 }; - if (order > MAX_CONTIG_ORDER) + if (unlikely(order > MAX_CONTIG_ORDER)) return -ENOMEM; set_xen_guest_handle(exchange.in.extent_start, in_frames); @@ -299,7 +299,7 @@ __xen_destroy_contiguous_region(unsigned long vstart, unsigned int order) if (!test_bit(start_gpfn, contiguous_bitmap)) return; - if (order > MAX_CONTIG_ORDER) + if (unlikely(order > MAX_CONTIG_ORDER)) return; set_xen_guest_handle(exchange.in.extent_start, &in_frame); -- 2.30.2